From: Marcin Maj <marcinmajsc@gmail.com>
Date: Fri, 14 Nov 2025 00:25:29 +0000 (+0100)
Subject: mc: update to 4.8.33
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=58fdabe4cdab8343af84ec67c78e15f44cfad446;p=feed%2Fpackages.git

mc: update to 4.8.33

Drop unnecessary patches. Changes in upstream repository already include them.
Changelog: https://raw.githubusercontent.com/MidnightCommander/mc/refs/tags/4.8.33/doc/NEWS

Signed-off-by: Marcin Maj <marcinmajsc@gmail.com>
---

diff --git a/utils/mc/Makefile b/utils/mc/Makefile
index 1b77b86c4c..3beb58f330 100644
--- a/utils/mc/Makefile
+++ b/utils/mc/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mc
-PKG_VERSION:=4.8.32
+PKG_VERSION:=4.8.33
 PKG_RELEASE:=1
 PKG_MAINTAINER:=
 PKG_LICENSE:=GPL-3.0-or-later
@@ -14,7 +14,7 @@ PKG_CPE_ID:=cpe:/a:midnight_commander:midnight_commander
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ftp.osuosl.org/pub/midnightcommander/
-PKG_HASH:=4ddc83d1ede9af2363b3eab987f54b87cf6619324110ce2d3a0e70944d1359fe
+PKG_HASH:=cae149d42f844e5185d8c81d7db3913a8fa214c65f852200a9d896b468af164c
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf gettext-version
 PKG_BUILD_DEPENDS:=MC_VFS:libtirpc
diff --git a/utils/mc/patches/010-subshell.patch b/utils/mc/patches/010-subshell.patch
deleted file mode 100644
index 64f3fdba91..0000000000
--- a/utils/mc/patches/010-subshell.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/subshell/common.c
-+++ b/src/subshell/common.c
-@@ -1143,7 +1143,7 @@ init_subshell_precmd (char *precmd, size
-                     "else "
-                     "[ \"${PWD##$HOME/}\" = \"$PWD\" ] && MC_PWD=\"$PWD\" || MC_PWD=\"~/${PWD##$HOME/}\"; "
-                     "fi; "
--                    "echo \"$USER@$(hostname -s):$MC_PWD\"; "
-+                    "echo \"$USER@$HOSTNAME:$MC_PWD\"; "
-                     "pwd>&%d; "
-                     "kill -STOP $$; "
-                     "}; " "PRECMD=precmd; " "PS1='$($PRECMD)$ '\n", subshell_pipe[WRITE]);
diff --git a/utils/mc/patches/030-mc-mksh-subshell-v2.patch b/utils/mc/patches/030-mc-mksh-subshell-v2.patch
deleted file mode 100644
index 37274c14c1..0000000000
--- a/utils/mc/patches/030-mc-mksh-subshell-v2.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/lib/shell.c
-+++ b/lib/shell.c
-@@ -70,6 +70,8 @@ mc_shell_get_installed_in_system (void)
-         mc_shell->path = g_strdup ("/bin/bash");
-     else if (access ("/bin/ash", X_OK) == 0)
-         mc_shell->path = g_strdup ("/bin/ash");
-+    else if (access ("/bin/mksh", X_OK) == 0)
-+        mc_shell->path = g_strdup ("/bin/mksh");
-     else if (access ("/bin/dash", X_OK) == 0)
-         mc_shell->path = g_strdup ("/bin/dash");
-     else if (access ("/bin/busybox", X_OK) == 0)
-@@ -151,6 +153,12 @@ mc_shell_recognize_real_path (mc_shell_t
-         mc_shell->type = SHELL_ZSH;
-         mc_shell->name = "zsh";
-     }
-+    else if (strstr (mc_shell->path, "/mksh") != NULL
-+             || strstr (mc_shell->real_path, "/mksh") != NULL)
-+    {
-+        mc_shell->type = SHELL_MKSH;
-+        mc_shell->name = "mksh";
-+    }
-     else if (strstr (mc_shell->path, "/tcsh") != NULL
-              || strstr (mc_shell->real_path, "/tcsh") != NULL)
-     {
---- a/lib/shell.h
-+++ b/lib/shell.h
-@@ -16,6 +16,7 @@ typedef enum
-     SHELL_BASH,
-     SHELL_ASH_BUSYBOX,          /* BusyBox default shell (ash) */
-     SHELL_DASH,                 /* Debian variant of ash */
-+    SHELL_MKSH,
-     SHELL_TCSH,
-     SHELL_ZSH,
-     SHELL_FISH
---- a/src/subshell/common.c
-+++ b/src/subshell/common.c
-@@ -380,6 +380,11 @@ init_subshell_child (const char *pty_nam
-         }
-         break;
- 
-+    case SHELL_MKSH:
-+        init_file = g_strdup (".shrc");
-+        g_setenv ("ENV", init_file, TRUE);
-+        break;
-+
-         /* TODO: Find a way to pass initfile to TCSH and FISH */
-     case SHELL_TCSH:
-     case SHELL_FISH:
-@@ -429,6 +434,7 @@ init_subshell_child (const char *pty_nam
- 
-     case SHELL_ASH_BUSYBOX:
-     case SHELL_DASH:
-+    case SHELL_MKSH:
-     case SHELL_TCSH:
-     case SHELL_FISH:
-         execl (mc_global.shell->path, mc_global.shell->path, (char *) NULL);
-@@ -1094,6 +1100,10 @@ init_subshell_precmd (char *precmd, size
-                     "PS1='\\u@\\h:\\w\\$ '\n", command_buffer_pipe[WRITE],
-                     command_buffer_pipe[WRITE], subshell_pipe[WRITE]);
-         break;
-+    case SHELL_MKSH:
-+        g_snprintf (precmd, buff_size,
-+                "PS1='$(pwd>&%d; kill -STOP $$)'\"$((( USER_ID )) && print '$ ' || print '# ')\"\n", subshell_pipe[WRITE]);
-+        break;
- 
-     case SHELL_ASH_BUSYBOX:
-         /* BusyBox ash needs a somewhat complicated precmd emulation via PS1, and it is vital